Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1153, add os-specifc socket flag function #1157

Merged

Conversation

jphickey
Copy link
Contributor

Describe the contribution
Adds the capability for the bsd sockets implementation to use a function provided by the OS layer to set the socket flags.

This allows VxWorks to have an alternative implementation that uses ioctl rather than fcntl to set the flags.

Fixes #1153

Testing performed
Build and sanity check CFE, run all tests

Expected behavior changes
VxWorks will use ioctl() rather than fcntl() to set the socket flags

System(s) tested on
Ubuntu

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

Adds the capability for the bsd sockets implementation to use
a function provided by the OS layer to set the socket flags.

This allows VxWorks to have an alternative implementation that
uses ioctl rather than fcntl to set the flags.
@skliper skliper added this to the 6.0.0 milestone Sep 21, 2021
@skliper
Copy link
Contributor

skliper commented Sep 21, 2021

Passed on SP0 w/ this change (no longer hangs in select-test).

@astrogeco astrogeco marked this pull request as ready for review September 21, 2021 19:04
@astrogeco astrogeco added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Sep 21, 2021
@astrogeco astrogeco changed the base branch from main to integration-candidate September 21, 2021 19:27
@astrogeco astrogeco merged commit 5108df3 into nasa:integration-candidate Sep 21, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Sep 21, 2021
@astrogeco astrogeco removed the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Sep 22, 2021
astrogeco added a commit to astrogeco/cFS that referenced this pull request Sep 22, 2021
**Combines**

nasa/cFE#1967 v6.8.0-rc1+dev1024

nasa/osal#1158 v5.1.0-rc1+dev619

nasa/sch_lab#92 v2.4.0-rc1+dev53

nasa/sample_app#155 v1.2.0-rc1+dev73

nasa/to_lab#105 v2.4.0-rc1+dev58

nasa/ci_lab#93 v2.4.0-rc1+dev46

**Includes:**

*cFE*

nasa/cFE#1948, Update name of macros/functions added to "cfe_assert"

nasa/cFE#1950, Fix Mismatch between MSG API and test case in "TestMsgId" functional test

nasa/cFE#1962, Single time domain in functional time tests

nasa/cFE#1943, add missing inclusions in CFE API headers

nasa/cFE#1964, Use existing /ram for FS header test

nasa/cFE#1956, Add static local to function test so data section is nonzero

nasa/cFE#1960, Make invalid buffer length consistent in es task test

nasa/cFE#1953, Only check base filename in library info functional

nasa/cFE#1970, Confirm sb/time reset requirements in coverage test

nasa/cFE#1947, Fix broken link in App Developers Guide

nasa/cFE#1972, Fix #1971, avoid alias warning on some compilers

*osal*

nas/osal#1149, Enable symbol api test and MIR dump too large

nasa/osal#1152, Fix OSAL loader test hard fails if size exceeded

nasa/osal#1155, add bsp-specific configuration flag registry

nasa/osal#1157, Add os-specifc socket flag function

*Apps*

nasa/ci_lab#92, Apply CFE_SB_ValueToMsgId where required

nasa/sample_app#154, Apply CFE_SB_ValueToMsgId where required

nasa/sch_lab#91, Apply CFE_SB_ValueToMsgId where required

nasa/to_lab#104, Apply CFE_SB_ValueToMsgId where required

Co-authored-by: Jacob Hageman   <skliper@users.noreply.github.com>
Co-authored-by: Joseph Hickey   <jphickey@users.noreply.github.com>
Co-authored-by: Adrien Chardon  <nodraak@users.noreply.github.com>
astrogeco added a commit to nasa/cFS that referenced this pull request Sep 22, 2021
**Combines**

nasa/cFE#1967 v6.8.0-rc1+dev1024

nasa/osal#1158 v5.1.0-rc1+dev619

nasa/sch_lab#92 v2.4.0-rc1+dev53

nasa/sample_app#155 v1.2.0-rc1+dev73

nasa/to_lab#105 v2.4.0-rc1+dev58

nasa/ci_lab#93 v2.4.0-rc1+dev46

**Includes:**

*cFE*

nasa/cFE#1948, Update name of macros/functions added to "cfe_assert"

nasa/cFE#1950, Fix Mismatch between MSG API and test case in "TestMsgId" functional test

nasa/cFE#1962, Single time domain in functional time tests

nasa/cFE#1943, add missing inclusions in CFE API headers

nasa/cFE#1964, Use existing /ram for FS header test

nasa/cFE#1956, Add static local to function test so data section is nonzero

nasa/cFE#1960, Make invalid buffer length consistent in es task test

nasa/cFE#1953, Only check base filename in library info functional

nasa/cFE#1970, Confirm sb/time reset requirements in coverage test

nasa/cFE#1947, Fix broken link in App Developers Guide

nasa/cFE#1972, Fix #1971, avoid alias warning on some compilers

*osal*

nas/osal#1149, Enable symbol api test and MIR dump too large

nasa/osal#1152, Fix OSAL loader test hard fails if size exceeded

nasa/osal#1155, add bsp-specific configuration flag registry

nasa/osal#1157, Add os-specifc socket flag function

*Apps*

nasa/ci_lab#92, Apply CFE_SB_ValueToMsgId where required

nasa/sample_app#154, Apply CFE_SB_ValueToMsgId where required

nasa/sch_lab#91, Apply CFE_SB_ValueToMsgId where required

nasa/to_lab#104, Apply CFE_SB_ValueToMsgId where required

Co-authored-by: Jacob Hageman   <skliper@users.noreply.github.com>
Co-authored-by: Joseph Hickey   <jphickey@users.noreply.github.com>
Co-authored-by: Adrien Chardon  <nodraak@users.noreply.github.com>
@astrogeco
Copy link
Contributor

CCB:2021-09-21 APPROVED

  • Add details of MCP750 bug to documentation

@jphickey jphickey deleted the fix-1153-avoid-fcntl-vxworks branch February 23, 2022 18:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

fcntl(G_GETFL) fails on VxWorks 6.9
3 participants